More general updates to this object. (Supports issue #1)