Switching from API 31 to 30