Tweaking and finishing the messaging logic