Ashish' changes