Updated for 4.0/LGOFNOC