Buffering added. Committin before cleaning