Massive format change - I think I caught everything