Added debugging clauses.