Updated Davinci setup