Some tweaks to make this work