Merge pull request #21 from abhidbydx/cr_work

Cr work
New changes in CR