added timestamp functionality etc.