more changes to design