Added 1.7, 1.8