Revert "Made it more friendly"

This reverts commit be18904449e7c7b36c013b0c5423682e291e4e5d.
Revert "Revert "Made it more friendly""

This reverts commit 5bb6ec7d738aaabac2faa6f6e6a002e105e7c2b3.