Add new demo patch, tweak stamp demo patch