Issue7 finished