added location check/enable life cycle - hope this works or else I'll have to hang myself...