final stage for phase 1

major changes