Add stamp call + logic