Added 63, 67, some minor changes