Switch to revised new format