Make it deliver on update too.
Fix ugly sig