Refactors to phasing