Moved new scroll code into delegate class