Performance improvements..