Added back EMS data, fixed graphs