performance improvements..