performance improvements
.
fixed merge conflicts