More changes to design