Factor out of the waterfall