after some design changes