implement 2.9b changes