Added EMD things