Massive long overdue update