Changed handler a bit