Final EMW Version changes