Newer version

Newer version of code, from the archives.