update to work with current libraries.