added location and location adapted, + test