Added 1.8 stuff