Updated functionality through step 6