closed #9 #10