More changes on the design