Some location manager stuff added