fixed up all ugs