working on #132 some more