Step 2 of previous commit