changed order of some structures in EM engine