Some tweaks James suggested