Change the name and make the return error a hash