Updated based on reviewer feedback