Start and Stop fixed to not spam beacons