refactored waterfall to allow for reordering of the securities