Need to fix transition & animations in step 12