added messages
almost finish