Made changes per phihag