Changed use of amended API