inplement 2.9b changes