more work on the new backend