Updates

This version is much more reliable.