changes by ashish is reverted