fixing part 4/?