Add better solution.