4.7 Back to the old format