Suggested changes for WhiteBox