final changes to Phase 2 + compiled