Added 1.7 and 1.6 things