partial commit #26 #25