Refactored URD