First set performance improvements