step 5, 6 and 7 fixes