Tweaked part 5 for better testing