small ondemand tweaking