Change args change to be optimizable