Much better solution.