Updates by Amanda and Mason

Changes for 2.22