update to address some API deprecations