applied Ashish's changes