Fixed up to channel step 3