Account for scroll position
Update for latest server