Adding changes from step 2.