Change the way the return value is sent, fix the documentation