Reworked the VUV computation a bit.