Finally fixed Pieratt from breaking everything.