fixes with p
more ps
merge