Added 6.18