adjusting for new format!() rules