newer version of this is in cvs