adjusted parameters to confirm to new style