updated to v2 emulation