Carlos/ustda consolidated rebased