1st changes by Shashi
2nd commit by Shashi