make big changes to adapt to the new backend