final changes before we replace this fork