Updated handler.