Added a checking mode