basket refactoring & fixes