next API changes, I hope it will work this time