Current code for step 2, without full data