part 2 fixed