re usecase matrix fixes......