conditional redirection added for locations, something is funky with exp still