Addition of waterfall and separation of visual components