tweaks; make faster