Moved EndOfCheckPhase a bit further along
Not working properly. Do not use at this time, please.