Tweaking the internal messaging