adopt the new API