Substantial performance improvements