Moving some properties from public x2