updated version of mock messages based on changes