Some more changes from davinci