Few changes, and ignore conf
Revert "Few changes, and ignore conf"

This reverts commit 1997c3820ae2e20c7a3a7eca139839e842e50606.
Few changes