Add stamp again, will debug tomorrow when I'm awake (and have completed my midterm...)