Updated phase 2