Feature/basket flux rebase