added messages and feedback