Completed step 3 with old code included