fixes the messaging by reimplementing it