added timestamp monitoring to prevent overwrites
merge