Updated to the point only time conversion is needed