Further updated setup script