added send update, fixed one-shot-message problem