Much better way to do it.