Consolidate step 2