Revised setup script