fine tune: generic and import deprecated API