changes suggested from RB