Allow scroll class
Added waypoint to controll scroll option