Added continuity checks