Add a much simpler solution!