Update to latest before merging with new backend