#54 update with custom event calling