Updated based on audit comments