finalizing event changes bug fixing