tweaked ondemandplus for more UI responsiveness