Added Location code