added 3.1 bpr support (experimental)