renamed handler, added comment