few testing tweaks on integrate