Redo 2-6 and force rake