corrected all Systime to duration for better Diff support