Update from Negi

Brajesh start working from here