changed order in part 2