2023: refactor some args