performance improvements
.