Revised some versions