Restructured to re-enable GK standalone mode.