Improving Beacons Demo