Updated for new parms