Some tweaks to the design