Improve auto-scroller