Cleaning up a bit. Added annoying beacon function