modified message to reflect recent changes
added message correctness checking