Adjusted repo. structure