added g11, which will contain krista's updates