Untested redirect - some if switch rearranging