Catching up with modifications. Discipline needed