Changes made as per user feedback