design changes
misc