Merging Changes from ENRS to fork