The refactor of the return closes #1