Some reformat
Double buffer