Last changes by CM 11