edit 0.8
edit 0.8 fix1