rewrote entirely the date sections