U3 refactor