Now passing all tests for phase 2