UVL optimizations round 1