Got rid of the early exit