adjusted setup script