Combined step 1 and 2