Take phase changing into account