merge in more 3.10.40 better still sod