Added q and f.