fixes for part2