fixes for part 2