with updated mapScroll