added time display
merge conflict fixed