Partially updated 1_1 and PART_2