commit for #10 #3