Merged ems update