Rearranage second part of step 2