a few more design changes