Modified setup script