Continue working on beacons