improve hanble events