Now with better changes (until I change my mind again.  Deal with it.)