Reworked for UB3