OP and EA merged code