make performance enhancements a bit better