added timestamp update handling