renamed handler, removed injection