Updates to issue #35