close #18 close #17 worked on #1 #19