#37 made messages shorter