Final commit before phase 3 submission