Tweaks to simulate step