refactoring basket. Part II