Finally got waterfall and scope looking good