Putting in sync with the CVS version