Make 351 update more comprehensive