More intelligent solution for Number7