Made changes by Chintan