added closure and buffer files