I see there is onMessageSending that could be better as well