Step 3

Containg the step described in issue #4