Back to old reliable scrolling, with minor updates