FJ - Cleanup,and Created local P() buffers for some funcitons