updated yo-back handler to support new client