made timestamp better, exception thing