Add (untested) segment verification)