updated for handoff