updates for #13 #18 #19