A very late, very large update