migrated more deprecated function calls