Change to redirect
removed unused code!