updated to work with 0.9.0