edit 0.9 final