Minor changes to design