Updated based on initial feedback