Minor changes, started working on Phases