added redirect
cleaned up