added messages
merge stuff