updating the whole thing, step 1
step2.