add more default params, rename to match arguments