Ashish changes incorporated