Making front end and stamping match
Merge branch 'stamp' into testing