changes requested by Issue #11