design changes here and there