updated for 0.7.x