Updated PS.Formatter