made changes as suggested in RB