Fixing transition and API errors. Try 2