Handoff logic updated