reverted filter change and implemented beacon as an object