added -f stuff