Update to 3.0 Builds, Cleaner SQL.
Reworked for UB3