Lots of changes to design