Various changes based on Customer Feedback