revert changes to use references instead of pointers... something broke scrolling