greatly improve performance again