Tweaks to Step 7