reorganizing messages to make it nicer