sort out rb2 vs rb3 issues