swap these to function inputs to be consistent with above