Disabled WAI, Added EMS
Revert "Disabled WAI, Added EMS"

This reverts commit 2f6c3a5aa74db3598d71c1ab29fc5dbf5400ca3c.
Revert "Revert "Disabled WAI, Added EMS""

This reverts commit 4b948b55d002526684e1a99b42cccac1148f6c29.
Revert "Disabled WAI, Added EMS"

This reverts commit 2f6c3a5aa74db3598d71c1ab29fc5dbf5400ca3c.
Fix WAI, Added EMS - Proper