OFSAA handoff to work seamlessly with the catch feature