Fix PART 2.2
Fix PART 2.3