Adding Clauses check (Important fixes needed)