minor changes in TimeStamp