udpated setup script