Location check code added, not integrated yet.