Renamed handler to complete