revised goto-strategy