Modified LogicObject code