Updated to 3.4.2; Part 2