Modify "waterfall" to improve response speed