Waterfall with improved callback