refine PS based on odesk suggestions