Added system clock checker and removed terminate Edt