update for 0.8*