Modify setup script
Modify x-setup script