some other design changes