Tweak waterfall and scope