edit 0.9 fix 3 Ready to review.