More changes to the design