Update handler + receiver
Update handler + receiver