More changes to RB detection