rewrote the format section