Location code added (not working yet)