refactored. removed transactional message