Recompiled after Paul's changes.
Recompiled with jwg, zack, mossyberg.