Uvs ready to be merge

These dashed lines aren't consistent with the code style of the rest of the repository, please fix