Update to 6.1, start from scratch, patches following