Final 1.7.10 version