Updates based on RB team feedback