Added buffer clauses