major changes to design