Added EMD Stuff