Add event as first argument to all methods and completed up to Listing 11.44