modified setup script