refac method parameters -> big regressions for now