new fixes to part 4