Added check-detection feature