refactor TUs