Changes made by John Rajesh (john.rajesh@cosmic-i.com).