Improve tables2, doesn't delete file now