Updated based on latest feedback