some small bug with ud fixed