refactored redirects so it makes more sense now