update for 0.9+