working on #24 #26