changed time format, merged