Changed phase handling
I totally forgot