Rework Reentry

FILTER EVENTS