Issue 8 review2

done