Added 6.1, 6.2, 6.4