Time stamps now work properly