add control to redirect correctly
merge conflict