Code

Added check to reset future timestamps