WI REFACTORING - PART 2