WIP fixed saving event function call