Tweak for new protocol