timestamp updates
added credit to Jishai