In time for the Beijing Olympics