Added out-fill for date