Added early termination