major changes to step 1, minor corrections in 0 & 2