tweaking handler stuff