added logic for ?flp handling