added timestamp option