Updated to match NotaTank Emu