Improve emsdriver code