Stay closer to old format