Changed to more closely match O2, as recommended by @roundhill