[refactor] change stuff to work with 2.5 api