Moved if statement to wrap just timestamp.