working on phase2 (done)