small design changes #2