Small changes to design