update return values with the recommended ones