some API level and associated code changes