edit 0.9 fix 4 Ready to review.