no message
merged thomas branch