conform updated API