3.0 --> 3.1 where appropriate