New /goto/ logic contributed by @clintharrison