Updated to support new FOG