more work on #131