added messages and notifications