New location worked
Expanding checks and feedback