Part of update addressing issue #26