Add 4.10 and simplify some things