reverted RB changes, moved to dev branch