implemented time format, little modifications