Change so that origin and destination need only be specified in one place