work on #94