revise pic and waterfall