Adam - added minor new changes for scrolling