Trying to get the messages working again