Much better number control