further performance improvements on loading