some changes to basket module