OE-Core fork