up/refactor uvs