Some modifications to design