Lots of changes to the design