updated for 1.9.RC1