major design changes done