Updated ret_val convention to project spec