Correct values, optimizing for speed