New feature: doesn't crash as much