Fix: phases are handled more equally now