Revised #160 and completed #10