update 1.2 part 2