[#66956272] modified to match new api specs