10x Performance improvements