You lost my old comment here. Leave the old code and just call this from negotiate.