basket changes from coders meeting [fix]