Phase 1 is now done correctly