Fix/make it possible to change senders