Made handler simpler