Final update for 2.1
stamp