Format 1 + update for Format 2