changed some stuff to ems