Experiment with performance improvements