rolled in design changes