Added folding properly into format