added address that triggered the handlers as the first argument
made the example compatible with the newly returned address param