issue #16, more work