Final touches to Third Party Emulator