updated for time string