Fixing / adding messaging.