Adding commented out scroll optimizations