Updates for PR #23