More changes. See #7.