Updated location listener + check