Script modifications in Location Tab