Manual Return Process

References #531
Process is not working completly but it is save to  merge. Will finish the issue when VM is working.