Changes for CA6