Updating: a bit reorganizing.