name fix and comment out
during part1