Some tweaks from Jeff