Upgraded to new kwaai stack