Tweaked the random message createor