revision basket & add dispatch & test connection