ONDEMAND: some more tuning, was too aggressive.