Resolving issue #4, 'improve _return feature'