Working on the return_handler