updated for 0.8