Bringing this up-to-date with the cvs version