Moved code to OOPEmulation