changed basket to class