UR-Overhaul

Part-2
Revert "UR-Overhaul"

This reverts commit fa3f839c78668896199e12922c0f97bc70d2e13b.