add messages //TODO refactor, clean messages