few design changes