Working phase plots
Fixed conflictS