Proper UKG Rebase