update to new and upcoming interface changes
make it build, but not work...