Updated FOP Query