modifications to use updated API