Multiple updates since last commit. Since CVS V00-02-13: unifying models. WIP version