Parameter is optional now (to squash)