Uc refactor