Cw6 improvements...