Huge performance improvements and improved parameters