Updates

Better/Fuller patch.