Updated to work on 3.10