fixed up messaging