PoC FP controls change

PoC FP controls change