initial attempts to improve data handoff stability