Reverting the changes of naresh branch