Make changes according to Ashwin's comments.