* added messages instead of redirects