initial 3.10 support