For waterfall

Some minor changes brought about by actually trying to use this in accounts