changes to work in 0.9.0.0