Made parameters more explicit