Corrected some issue with FFPOC-8
Completed the story FFPOC-9