added proper redirects