Revert "Revert "Intial changes has done""

This reverts commit 26c0ba3b8747ad896ef0ab847d1851889319f9ee.