add proper time conversion