more work on #342