couple more design changes