Merging ENRS and proposed changs
Revert "Merging ENRS and proposed changs"

This reverts commit af20ae07818c56cf82ccc8a73ad3367f88e691e8.
Merging Changes from ENRS to fork