took out location names for now
fixing stupid fuckign conflicts