added new arguments to *Factor functions