Using my fork of BBR for duplicate ID fix