Added 1.7.10 code