working on #26, minor update