Repair location/return process with 2 terminal
Allow to cancel return process.