Uvs ready to be merge

It will be good to have 1 line comments for these helper functionalities"