PFS-862 #comment final stuff