haddvialocation() modified