updated messages to match "requirements"