Refactor box - modified redirects