Updated auto-scrolling