Updated for for latest uncompressed version.