Added step 7 - doesn't fully work .