Update find_events and main_functions