Made handlers a little simpler.