More syntax changes to UV Decomposition