add params
clean up