Much better and simpler.