- new merge with latest sources from Eliot