Updated Scroll code