Code from the old cvs repository