a few design changes