add params, more cleanup