Auto-referencing removed; UWMadSetup added