Should be done. Ready for comments.