small design changes again