Back to old OC emulation and clock changes for testing