#performance improvements