more work on #54