Add smart-forward && change-inner