changed everything to ems, other things