First working cleanup, including DownOperation adjustments