fixes for part 5