Step 6 - changes to main call and autoreg