this addresses some of #28 issues