add single check + debug mode