only minor changes to deal with the changes in the libraries.
Merge branch 'temp'