Working on improving sending of messages