pushing some design changes