Steps re-written