-. modify timestamp logic