updating based on feedback
removing AllMessages