switch to ESM, take 2