Cleaned up u.y a little more.