EMP now does all it should do