Small changes to Design according to lesson