juggle the placement of ipfselwait around to put it only where needed
2 files changed