Uvs ready to be merge

fixed!