working on #98