Added temporary code to force date