Added return_op