address RB comments