Make the setup work better