fixes in part 3