Updated current location functions