Added some EM stuff