Added messages for easier testing