Trying to make more performance improvements.