working on dynamic date display on show
resolved merge conflict