Updating: some reorganization.