Some tweaks to when