Further rework of 'Capturing the Ogres'.