more work on #153