added phase 3 changes