Updated to match scrollView API