added messages to returns