added location conditionals because the db info was not consistent. hack.