Added feature of current location