partially addressing #97