Some reverting on the design