Make ondemand more battery friendly