rearrange Beacon detection