Added 917B stuff