setup script fixed 2