Modify SetActivity
Modify SetActivity