Finally refined and more efficient.