some improvement with scrolling