made some changes in handoff