Implemented phase2.5 plan 1