some small design changes