1.7 update part 2