design changes and other stuff