some more design changes