Update. Some correction