v2.1 except stripe